Skip to content

Rollup of 5 pull requests - #68272

Merged
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-vrb90gu
Jan 16, 2020
Merged

Rollup of 5 pull requests#68272
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-vrb90gu

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

cjgillotand others added 21 commits January 11, 2020 18:19
It is not self-explanatory whether the fract() function inverts the fractional part of negative numbers.
Co-Authored-By: Mateusz Mikuła <mati865@users.noreply.github.com>
Move some queries from rustc::ty to librustc_ty.
cc rust-lang#65031
Clean up some diagnostics by making them more consistent
In general:
- Diagnostic should start with a lowercase letter.
- Diagnostics should not end with a full stop.
- Ellipses contain three dots.
- Backticks should encode Rust code.
I also reworded a couple of messages to make them read more clearly.
It might be sensible to create a style guide for diagnostics, so these informal conventions are written down somewhere, after which we could audit the existing diagnostics.
r? @Centril
Use 3.6 instead of 3.5 in float fract() documentation
It is not self-explanatory whether the fract() function inverts the fractional part of negative numbers. This change clarifies this possible question (so that it is `.6` not `.4`)
…-DPC
Fix some issue numbers of unstable features
Looking into the unstable book, some issue numbers are outdated.
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Jan 16, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 90b9a62 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 Jan 16, 2020
@bors

bors commented Jan 16, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 90b9a62 with merge 9fe05e9...

bors added a commit that referenced this pull request Jan 16, 2020
Rollup of 5 pull requests
Successful merges:
- #67780 (Move some queries from rustc::ty to librustc_ty.)
- #68096 (Clean up some diagnostics by making them more consistent)
- #68223 (Use 3.6 instead of 3.5 in float fract() documentation)
- #68265 (Fix some issue numbers of unstable features)
- #68266 (Changed docs for f32 and f64.)
Failed merges:
- #68204 (Use named fields for `{ast,hir}::ItemKind::Impl`)
r? @ghost
@bors

bors commented Jan 16, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 16, 2020
@bors
bors merged commit 90b9a62 into rust-lang:masterJan 16, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #68272!

Tested on commit 9fe05e9.
Direct link to PR: #68272

💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).

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.

9 participants

@Dylan-DPC-zz@bors@rust-highfive@cjgillot@varkor@SOF3@JohnTitor@Stromberg90@Dylan-DPC