Skip to content

Rollup of 6 pull requests #69226

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 15 commits into from
Feb 17, 2020
Merged

Rollup of 6 pull requests #69226

merged 15 commits into from
Feb 17, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

sdegutis and others added 15 commits January 23, 2020 15:25
This might spare someone else a little time searching the stdlib for unicode/grapheme support.
s/for reads and writes/for both ...
Added missing condition:
`dst` must be readable
For all methods which read a value of type T, `read`, `read_unaligned`,
`read_volatile` and `replace`, added missing
constraint:
The value they point to must be properly initialized
Added missing conditions:
- Valid for writes
- Valid for destructing
Updating str.chars docs to mention crates.io.

This might spare someone else a little time searching the stdlib for unicode/grapheme support.
Improve #Safety of various methods in core::ptr

For `read`, `read_unaligned`,`read_volatile`, `replace`, and `drop_in_place`:

- The value they point to must be properly initialized

For `replace`, additionally:

- The pointer must be readable
…thewjasper

Don't print block exit state in dataflow graphviz if unchanged

A small quality-of-life improvement I was using while working on rust-lang#68528. It's pretty common to have a lot of zero-statement basic blocks, especially before a `SimplifyCfg` pass is run. When the dataflow state was dense, these blocks could take up a lot of vertical space since the full flow state was printed on both entry and exit. After this PR, we only print a block's exit state if it differs from that block's entry state. Take a look at the two basic blocks on the left.

Before:

![image](https://user-images.githubusercontent.com/29463364/74505395-e2d1dd00-4eab-11ea-8006-ec8f0dc9d1b6.png)

After:
![image](https://user-images.githubusercontent.com/29463364/74505277-98506080-4eab-11ea-8d95-5190bc378331.png)
Rename `FunctionRetTy` to `FnRetTy`

As per FIXME comment

r? @Centril
[tiny] parser: `macro_rules` is a weak keyword

r? @Centril
@JohnTitor
Copy link
Member Author

@bors r+ p=6 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 17, 2020

📌 Commit cc497c4 has been approved by JohnTitor

@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 Feb 17, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Feb 17, 2020
@bors
Copy link
Collaborator

bors commented Feb 17, 2020

⌛ Testing commit cc497c4 with merge 75b98fb...

bors added a commit that referenced this pull request Feb 17, 2020
Rollup of 6 pull requests

Successful merges:

 - #68495 (Updating str.chars docs to mention crates.io.)
 - #68701 (Improve #Safety of various methods in core::ptr)
 - #69158 (Don't print block exit state in dataflow graphviz if unchanged)
 - #69179 (Rename `FunctionRetTy` to `FnRetTy`)
 - #69186 ([tiny] parser: `macro_rules` is a weak keyword)
 - #69188 (Clean up E0309 explanation)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Feb 17, 2020

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing 75b98fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 17, 2020
@bors bors merged commit cc497c4 into rust-lang:master Feb 17, 2020
@JohnTitor JohnTitor deleted the rollup-syn03oj branch March 27, 2020 00:16
# 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.

7 participants