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 14 pull requests #56437

Closed
wants to merge 36 commits into from
Closed

Rollup of 14 pull requests #56437

wants to merge 36 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 2, 2018

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 30 commits November 28, 2018 21:22
We've seen sporadic QE failures in the timeout tests on this assertion:

    assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);

So there's an error, but not either of the expected kinds.  Adding a
format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`).

For the cases that were using `read`, we can just use `read_exact` to
keep trying after interruption.  For those using `recv_from`, we have to
manually loop until we get a non-interrupted result.
The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.
…cramertj

Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks

It isn't settled exactly how references to uninhabited types and unions of uninhabited types should act, but we should be more conservative here, as it's likely it will be permitted to soundly have values of such types.

This will also be more important in light of the changes at rust-lang#54125.

cc @RalfJung
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
… r=Centril

Stabilize self_in_typedefs feature

[**Tracking Issue**](rust-lang#49303)

r? @Centril
…ref, r=davidtwco

Refer to the second borrow as the "second borrow" in E0501.rs

Fixes rust-lang#55314.

r? @davidtwco
…kler

Deal with EINTR in net timeout tests

We've seen sporadic QE failures in the timeout tests on this assertion:

    assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);

So there's an error, but not either of the expected kinds.  Adding a
format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`).

For the cases that were using `read`, we can just use `read_exact` to
keep trying after interruption.  For those using `recv_from`, we have to
manually loop until we get a non-interrupted result.
…nSapin

Stabilize dbg!(...)

Per FCP in rust-lang#54306 (which is ~1 day from completion).

r? @SimonSapin

The PR is fairly isolated so a rollup should probably work.
…olnay

Move VecDeque::resize_with out of the impl<T:Clone> block

I put this in the wrong `impl` block in rust-lang#56016, so fixing.

Tracking issue for the unstable method: rust-lang#41758 (comment)
…e, r=Centril

Improve the unstable book example for #[marker] trait

The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.
Update tracking issue for `extern_crate_self`
Fix failing tidy (line endings on Windows)

Updates to `rustc-guide` and `edition-guide` including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.
Update issue number of `shrink_to` methods to point the tracking issue

Tracking issue: rust-lang#56431
@Centril
Copy link
Contributor Author

Centril commented Dec 2, 2018

#56358 is no longer in rollup;

@bors r+ p=14

@bors
Copy link
Contributor

bors commented Dec 2, 2018

📌 Commit c03c34c has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 2, 2018
@bors
Copy link
Contributor

bors commented Dec 2, 2018

⌛ Testing commit c03c34c with merge 1a8b4e9...

bors added a commit that referenced this pull request Dec 2, 2018
Rollup of 14 pull requests

Successful merges:

 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56424 (Mention raw-ident syntax)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 2, 2018

💔 Test failed - status-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 Dec 2, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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:22:55] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_4","title":"Indexing"}}Content-Length: 733
[01:22:55] 
[01:22:55] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"unused_variables","message":"unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider using `_unused` instead: `_unused`","range":{"end":{"character":30,"line":2},"start":{"character":24,"line":2}},"severity":2,"source":"rustc"},{"code":"unused_variables","message":"unused variable: `test_val`\n\nhelp: consider using `_test_val` instead: `_test_val`","range":{"end":{"character":36,"line":9},"start":{"character":28,"line":9}},"severity":2,"source":"rustc"}],"uri":"file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t0/simple_workspace/library/src/lib.rs"}}Content-Length: 444
[01:22:55] 
[01:22:55] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"E0425","message":"cannot find function `fetch_u32` in module `library`\n\nnot found in `library`","range":{"end":{"character":53,"line":4},"start":{"character":44,"line":4}},"severity":1,"source":"rustc"}],"uri":"file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t0/simple_workspace/binary/src/main.rs"}}Content-Length: 104
[01:22:55] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_4","title":"Indexing"}}
[01:22:55] ---------------
[01:22:55] 
[01:22:55] 
---
[01:32:00] test [compile-fail] compile-fail-fullmir/stacked_borrows/aliasing_mut4.rs ... ok
[01:32:00] test [compile-fail] compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs ... ok
[01:32:00] test [compile-fail] compile-fail-fullmir/stacked_borrows/buggy_as_mut_slice.rs ... ok
[01:32:00] test [compile-fail] compile-fail-fullmir/stacked_borrows/buggy_split_at_mut.rs ... ok
[01:32:01] test [compile-fail] compile-fail-fullmir/stacked_borrows/deallocate_against_barrier.rs ... ok
[01:32:01] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read2.rs ... ok
[01:32:01] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read3.rs ... ok
[01:32:01] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read4.rs ... ok
[01:32:01] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_write1.rs ... ok
---
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/aliasing_mut4.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/buggy_as_mut_slice.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/buggy_split_at_mut.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/deallocate_against_barrier.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read2.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read3.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_read4.rs ... ok
[01:32:15] test [compile-fail] compile-fail-fullmir/stacked_borrows/illegal_write1.rs ... ok
---
travis_time:end:06759d32:start=1543773694719257170,finish=1543773694726482805,duration=7225635
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:040e62e4
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1d9038c6
travis_time:start:1d9038c6
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:13aa76ce
$ dmesg | grep -i kill

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 Centril closed this Dec 2, 2018
@Centril Centril deleted the rollup branch December 2, 2018 18:41
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.