Skip to content

Rollup of 7 pull requests - #71483

Merged
bors merged 25 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-c2h9s8b
Apr 23, 2020
Merged

Rollup of 7 pull requests#71483
bors merged 25 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-c2h9s8b

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

kperand others added 25 commits March 31, 2020 22:15
Only the "first" iterator is actually set `None` when exhausted,
depending on whether you iterate forward or backward. This restores
behavior similar to the former `ChainState`, where it would transition
from `Both` to `Front`/`Back` and only continue from that side.
However, if you mix directions, then this may still set both sides to
`None`, totally fusing the iterator.
Confusing suggestion on incorrect closing `}`
Compiler returns
```
error: unexpected closing delimiter: `}`
--> main.rs:20:1
|
9 | ErrorHandled::Reported => {}
| -- this block is empty, you might have not meant to close it temp
...
20 | }
| ^ unexpected closing delimiter
error: aborting due to previous error
```
Don't fuse Chain in its second iterator
Only the "first" iterator is actually set `None` when exhausted,
depending on whether you iterate forward or backward. This restores
behavior similar to the former `ChainState`, where it would transition
from `Both` to `Front`/`Back` and only continue from that side.
However, if you mix directions, then this may still set both sides to
`None`, totally fusing the iterator.
Fixesrust-lang#71375
r? @scottmcm
…gs, r=kinnison
Check code blocks tags
Fixesrust-lang#71347.
Explanations here: I realized recently that it was a common issue to confuse/misspell tags on code blocks. This is actually quite a big issue since it generally ends up in a code blocks being ignored since it's not being considered as a rust one. With this new warning, users will at least be notified about it.
PS: some improvements can be done on the error rendering but considering how big the PR already is, I think it's better to do it afterwards.
r? @ollie27
cc @rust-lang/rustdoc
Only use read_unaligned in transmute_copy if necessary
I've noticed that this causes LLVM to generate poor code on targets that don't support unaligned memory accesses.
…evink
Fix doc links
This fixes a few doc links which were causing `cargo doc` to fail when using `--document-private-items --document-hidden-items` on libstd. Most of the fixes are just escaping '[' and ']' characters in doc comments, and one change actually fixes a doc link.
…chievink
add back Scalar::null_ptr
We were a bit overeager with removing this in rust-lang#71005, Miri uses this function quite a bit.
The important part is that the `Place::null` methods are gone. :)
r? @jonas-schievink@oli-obkFixesrust-lang#71474
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ p=7 rollup=never

@bors

bors commented Apr 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b107eb5 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 23, 2020
@bors

bors commented Apr 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b107eb5 with merge 14b1552...

@bors

bors commented Apr 23, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2020
@bors
bors merged commit 14b1552 into rust-lang:masterApr 23, 2020
@borsbors mentioned this pull request Apr 23, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #71483!

Tested on commit 14b1552.
Direct link to PR: #71483

🎉 miri on windows: build-fail → test-pass (cc @oli-obk@eddyb@RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk@eddyb@RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 23, 2020
Tested on commit rust-lang/rust@14b1552.
Direct link to PR: <rust-lang/rust#71483>
🎉 miri on windows: build-fail → test-pass (cc @oli-obk@eddyb@RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk@eddyb@RalfJung).
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

11 participants

@Dylan-DPC-zz@bors@rust-highfive@kper@cuviper@TimDiekmann@Amanieu@GuillaumeGomez@TyPR124@RalfJung@Dylan-DPC