Skip to content

Rollup of 11 pull requests - #66485

Merged
bors merged 29 commits into
rust-lang:masterfrom
JohnTitor:rollup-vbwhg6r
Nov 17, 2019
Merged

Rollup of 11 pull requests#66485
bors merged 29 commits into
rust-lang:masterfrom
JohnTitor:rollup-vbwhg6r

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

czipperzand others added 29 commits November 14, 2019 01:33
The example refers to a static lifetime parameter that can be elided.
This parameter is not included, meaning lifetime elision is not shown.
Revert weird renaming of the former `LitError::report`
The previous ordering of the sentences kept switching between the return
value and the value of `self` after execution, making it hard to follow.
Additionally, as rendered in the browser, the period in "`Self`. `self`"
was difficult to make out as being a sentence separator and not one code
block.
Remove the incorrect usage of "copy" as the trait is not called.
Improve documentation of `Vec::split_off(...)`
The previous ordering of the sentences kept switching between the return
value and the value of `self` after execution, making it hard to follow.
Additionally, as rendered in the browser, the period in "`Self`. `self`"
was difficult to make out as being a sentence separator and not one code
block.
syntax: Keep string literals in ABIs and `asm!` more precisely
As a result we don't lose spans when `extern` functions or blocks are passed to proc macros, and also escape all string literals consistently.
Continuation of rust-lang#60679, which did a similar thing with all literals besides those in ABIs and `asm!`.
TODO: Add tests.
Fixesrust-lang#60493Fixesrust-lang#64561
r? @Centril
…sper
rustc_plugin: Remove `Registry::register_attribute`
Legacy plugins cannot register inert attributes anymore.
The preferred replacement is to use `register_tool` ([tracking issue](rust-lang#66079)).
```rust
#![register_tool(servo)]
#[servo::must_root]
struct S;
```
The more direct replacement is `register_attribute` ([tracking issue](rust-lang#66080))
```rust
#![register_attr(must_root)]
#[must_root]
struct S;
```
, but it requires registering each attribute individually rather than registering the tool once, and is more likely to be removed rather than stabilized.
find_deprecation: deprecation attr may be ill-formed meta.
Fixesrust-lang#66340.
r? @petrochenkov
cc @pnkfelix
…lan-DPC
Centralize panic macro documentation
This is just the main commit from rust-lang#61511 (which got closed because the author didn't reply) cherry-picked on the current master. Building `core` and `std` on this branch in stage 1 succeeded, which I thinks means the issues from the previous PR should be gone (but let's see what CI says).
…crum
Move `DIAGNOSTICS` usage to `rustc_driver`
Remove `rustc_interface`'s dependency on `rustc_error_codes` and centralize all usages of `DIAGNOSTICS` in `rustc_driver`. Once we remove all references to `rustc_error_codes` in all other crates but `rustc_driver`, this should allow for incremental recompilation of the compiler to be smoother when tweaking error codes. This works towards rust-lang#66210 (comment).
(May include traces of minor drive-by cleanup.)
r? @Mark-Simulacrum
…hown, r=rkruppe
add missing 'static lifetime in docs
miri panic_unwind: fix hack for SEH platforms
The old hack didn't work as we ended up duplicating the `eh_personality` lang item...
I have no idea if rustc cares that `eh_catch_typeinfo` has a certain shape, but better safe than sorry. I cannot test this locally.
r? @oli-obk Cc @Aaron1011
Use "field is never read" instead of "field is never used"
this is my first PR here so please let me know if i am doing it wrong
closesrust-lang#64465
i will be referencing this with a book PR that updates the same language
…=Centril
Clarify transmute_copy documentation example
Currently the documentation for `transmute_copy` implies that the function accepts a slice due to the variable name chosen in the example. This is misleading as `foo_slice` is actually an array and `transmute_copy` cannot take an unsized type anyway.
This PR just clarifies things by renaming the variable used in the example.
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=11 rollup=never

@bors

bors commented Nov 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit f65cb87 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 17, 2019
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Nov 17, 2019
@bors

bors commented Nov 17, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f65cb87 with merge 8831d76...

bors added a commit that referenced this pull request Nov 17, 2019
Rollup of 11 pull requests
Successful merges:
- #65739 (Improve documentation of `Vec::split_off(...)`)
- #66271 (syntax: Keep string literals in ABIs and `asm!` more precisely)
- #66344 (rustc_plugin: Remove `Registry::register_attribute`)
- #66381 (find_deprecation: deprecation attr may be ill-formed meta.)
- #66395 (Centralize panic macro documentation)
- #66456 (Move `DIAGNOSTICS` usage to `rustc_driver`)
- #66465 (add missing 'static lifetime in docs)
- #66466 (miri panic_unwind: fix hack for SEH platforms)
- #66469 (Use "field is never read" instead of "field is never used")
- #66471 (Add test for issue 63116)
- #66477 (Clarify transmute_copy documentation example)
Failed merges:
r? @ghost
@bors

bors commented Nov 17, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing 8831d76 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2019
@bors
bors merged commit f65cb87 into rust-lang:masterNov 17, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #66485!

Tested on commit 8831d76.
Direct link to PR: #66485

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 17, 2019
Tested on commit rust-lang/rust@8831d76.
Direct link to PR: <rust-lang/rust#66485>
💔 clippy-driver on windows: test-fail → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
@JohnTitor
JohnTitor deleted the rollup-vbwhg6r branch November 17, 2019 07:49
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.

11 participants

@JohnTitor@bors@rust-highfive@czipperz@Centril@mulimoen@RalfJung@petrochenkov@mqudsi@ALSchwalm@Alexendoo