Skip to content

Rollup of 6 pull requests #72639

New issue

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

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

Already on GitHub? # to your account

Merged
merged 12 commits into from
May 27, 2020
Merged

Rollup of 6 pull requests #72639

merged 12 commits into from
May 27, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

rossmacarthur and others added 12 commits May 25, 2020 09:23
Use raw pointers to avoid making any assertions about the data field.
confusing diagnostics, issue rust-lang#72253

add test for confusing error message, issue-72253


remove is_multiline check, refactor to self.expect(&token:Semi)


update issue-72253 tests


return Ok
Fix confusing error message for comma typo in multiline statement

Fixes rust-lang#72253.  Expands on the issue with a colon typo check.

r? @estebank

cc @ehuss
Resolve UB in Arc/Weak interaction (2)

Use raw pointers to avoid making any assertions about the data field.

Follow up from rust-lang#72479, see that PR for more detail on the motivation.

@RalfJung I was able to avoid a lot of the changes to `Weak`, by making a helper type (`WeakInner`) - because of auto-deref and because the fields have the same name, the rest of the code continues to compile.
…=nikomatsakis

Add test for old compiler ICE when using `Borrow`

The original issue was caused by implementing `Borrow` on a local type and using the tokio-reactor crate which had this impl: https://github.com/tokio-rs/tokio/blob/tokio-0.1.4/tokio-reactor/src/poll_evented.rs#L547-L577

This causes an ICE on Rust 1.27.0:

```console
$ RUSTUP_TOOLCHAIN=1.27.0 rustc src/test/ui/issues/issue-50687-ice-on-borrow.rs
error: internal compiler error: librustc/traits/structural_impls.rs:180: impossible case reached

thread 'main' panicked at 'Box<Any>', librustc_errors/lib.rs:554:9
note: Run with `RUST_BACKTRACE=1` for a backtrace.
error: aborting due to previous error

note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

note: rustc 1.27.0 (3eda71b 2018-06-19) running on x86_64-apple-darwin
```

Closes rust-lang#50687
…changes, r=Dylan-DPC

Remove font-display settings

Since for the moment, the result isn't as expected since rust-lang#72092 when not using docs locally, let's revert them.

r? @Dylan-DPC
…olnay

Add remark regarding DoubleEndedIterator

While reviewing rust-itertools/itertools@14293bd#diff-2c16d2ada06ad2fd1fc754679646d471, I realized that a `DoubleEndedIterator` may yield different elements depending on whether it is traversed forwards or backwards. (Not only the *order*, but possibly also the yielded values.)

I found this remarkable, but could not find anything in the current docs, so I thought it may be worth mentioning this explicitly.

Unfortunately, I could not test these changes locally (`rustdoc` complains about `unresolved import`). Sorry if this causes headache.

If I should change something, please let me know. If it seems too trivial, feel free to just close this PR.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented May 27, 2020

📌 Commit e6353aa has been approved by Dylan-DPC

@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 May 27, 2020
@bors
Copy link
Collaborator

bors commented May 27, 2020

⌛ Testing commit e6353aa with merge b375af3d55d81203d61675156c31089d953936b3...

@bors
Copy link
Collaborator

bors commented May 27, 2020

💔 Test failed - checks-azure

@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 May 27, 2020
@Diggsey
Copy link
Contributor

Diggsey commented May 27, 2020

Looks spurious...

@JohnTitor
Copy link
Member

@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 May 27, 2020
@bors
Copy link
Collaborator

bors commented May 27, 2020

⌛ Testing commit e6353aa with merge acfc558...

@bors
Copy link
Collaborator

bors commented May 27, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing acfc558 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 27, 2020
@bors bors merged commit acfc558 into rust-lang:master May 27, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label May 28, 2020
# for free to join this conversation on GitHub. Already have an account? # 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.

9 participants