Skip to content

Rollup of 5 pull requests - #71223

Merged
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-z5itu39
Apr 17, 2020
Merged

Rollup of 5 pull requests#71223
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-z5itu39

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

bishtpawanand others added 12 commits April 12, 2020 17:22
Refactor code as per the suggestions
Refacotor code
provide edition support
1. Changed descriptions of `fn get` & `fn get_mut`.
Since both of these functions are returning references, and not the owned value, I thought the doc comments could be fixed to be consistent with doc comments of `fn front` & `fn front_mut`.
2. Other changes are minor fixes or additions for clarification.
Thank you for taking a look :)
…or-code-e0708, r=GuillaumeGomez
Add long error explanation for E0708 rust-lang#61137
Add long explanation for the E0708 error code
Part of rust-lang#61137
r? @GuillaumeGomez
Don't use the HirId to NodeId map in MIR
Another step towards not having to build a `HirId` to `NodeId` map other than for doc and RLS purposes.
We are currently sorting `unsafe` blocks by `NodeId` in `check_unsafety`; change it to sorting by `Span` instead; this passes the tests, but better ideas are welcome.
In addition, simplify the split between the used and unused `unsafe` blocks for readability and less sorting.
cc rust-lang#50928
Update cargo
3 commits in 74e3a7d5b756d7c0e94399fc29fcd154e792c22a..ebda5065ee8a1e46801380abcbac21a25bc7e755
2020-04-13 20:41:52 +0000 to 2020-04-16 14:28:43 +0000
- Don't use debug display for error object. (rust-lang/cargo#8119)
- Add backwards-compatibility for old cargo-tree flags. (rust-lang/cargo#8115)
- Try to avoid panics on buggy (?) clocks (rust-lang/cargo#8114)
Minor fixes to doc comments of 'VecDeque'
1. Changed descriptions of `fn get` & `fn get_mut`.
Since both of these functions are returning references, and not the owned value, I thought the doc comments could be fixed to be consistent with doc comments of `fn front` & `fn front_mut`.
2. Other changes are minor fixes or additions for clarification.
Thank you for taking a look :)
…-Simulacrum
Dogfood or_patterns in rustdoc
We can start using `or_patterns` in `rustdoc` as a step toward stabilization.
cc rust-lang#54883@Centril
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Apr 16, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit f51d2d0 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 16, 2020
@Dylan-DPC-zzDylan-DPC-zz added the rollup A PR which is a rollup label Apr 16, 2020
@bors

bors commented Apr 16, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f51d2d0 with merge 868b51b...

@bors

bors commented Apr 17, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2020
@bors
bors merged commit 868b51b into rust-lang:masterApr 17, 2020
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.rollupA PR which is a rollupS-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.

8 participants

@Dylan-DPC-zz@bors@bishtpawan@ljedrz@ehuss@JOE1994@cuviper@Dylan-DPC