Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #62271

Closed
wants to merge 32 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 1, 2019

Successful merges:

Failed merges:

r? @ghost

crlf0710 and others added 30 commits June 24, 2019 19:51
This also adds assertions that the operations work as expected.
Since switching CI to Azure Pipelines it seems that this test seems
to fail more consistently, so let's disable that for now. It helps
that we have less than a week before release - we disallow PRs that
break the tools to land in this period, so this makes landing critical
PRs smoother  now.

r? @alexcrichton
Unreserve `macro_rules` as a macro name
…r=alexcrichton

MSVC link output improve

Resolves rust-lang#35785.

However i haven't come up with a idea to add test case for this :(

r? @retep998
…thewjasper

Adjust warning of -C extra-filename with -o.

If `--emit` includes multiple unnamed outputs, and `-o` was specified, and `-C extra-filename` was specified, the compiler would warn that `-C extra-filename` was ignored, but this is not true.  The "adapting" of the filenames includes the extra-filename info.

Since this is a little convoluted and hard to follow, here is a little chart to summarize when running with `rustc foo.rs -o xyz -C extra-filename=asdf`

`--emit` | Result
---------|--------
`link` | `xyz` (extra-filename ignored)
`link,dep-info` | `xyzasdf`, `xyzasdf.d` (this PR removes the incorrect warning)

As to whether or not this behavior is the best choice is another question.
…links, r=docs

Add missing links for TryFrom docs

r? @rust-lang/docs
…ks-into, r=docs

Add missing type urls in Into trait

r? @rust-lang/docs
…-casts, r=RalfJung

Enable intptrcast for explicit casts

I checked locally that this does not break miri on master. r? @RalfJung
…, r=GuillaumeGomez

Improve box clone doctests to ensure the documentation is valid
…mple, r=dtolnay

Update mem::replace example to not be identical to mem::take

This also adds assertions that the operations work as expected.
…, r=varkor

Switch tracking issue for `#![feature(slice_patterns)]`

Switches the tracking issue for `#![feature(slice_patterns)]` to a fresh one in rust-lang#62254 due to new RFCs.

Closes rust-lang#23121.

r? @varkor
syntax: Unsupport `foo! bar { ... }` macros in the parser

Their support in expansion was removed in rust-lang#61606.

Also un-reserve `macro_rules` as a macro name, there's no ambiguity between `macro_rules` definitions and macro calls (it also wasn't reserved correctly).

cc rust-lang/wg-grammar#51
Centril added 2 commits July 1, 2019 17:40
Update RLS to disable spurious client_find_definitions test

Since switching CI to Azure Pipelines it seems that this test seems
to fail more consistently, so let's disable that for now. It helps
that we have less than a week before release - we disallow PRs that
break the tools to land in this period, so this makes landing critical
PRs smoother  now.

r? @alexcrichton
@Centril
Copy link
Contributor Author

Centril commented Jul 1, 2019

@bors r+ p=12 rollup=never

@bors
Copy link
Contributor

bors commented Jul 1, 2019

📌 Commit 0783a2d has been approved by Centril

@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 Jul 1, 2019
@pietroalbini
Copy link
Member

FYI #62259 does not need to land anymore.

@bors
Copy link
Contributor

bors commented Jul 2, 2019

⌛ Testing commit 0783a2d with merge 25571d35772daf2a23fc47beff25f05a23071c07...

@bors
Copy link
Contributor

bors commented Jul 2, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 2, 2019
@Centril Centril closed this Jul 2, 2019
@Centril Centril deleted the rollup-0kmiua2 branch July 2, 2019 05:05
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.