Skip to content

Rollup of 6 pull requests - #70648

Closed
Centril wants to merge 39 commits into
rust-lang:masterfrom
Centril:rollup-zmxc9ef
Closed

Rollup of 6 pull requests#70648
Centril wants to merge 39 commits into
rust-lang:masterfrom
Centril:rollup-zmxc9ef

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

rcohand others added 30 commits March 27, 2020 22:02
This diff improves error messages around raw strings in a few ways:
- Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test)
- Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings
- Detect potentially intended terminators (longest sequence of "#*" is suggested)
This is a pure refactoring with no behavior changes.
This is a follow-up to rust-lang#70123, which added `llvm-config --libdir` to the
`LIBRARY_PATH` for rustc tools. We need the same for "run-make-fulldeps"
and "ui-fulldeps" tests which depend on compiler libraries, implicitly
needing to link to `-lLLVM` as well.
spastorinoand others added 9 commits March 31, 2020 18:49
…z, r=davidtwco
Add `-Z dump-mir-dataflow` flag for dumping dataflow results visualization
Previously, to visualize the results of a MIR dataflow pass, one had to add a `#[rustc_mir(borrowck_graphviz_postflow)]` attribute to functions of interest. However, there is no way to specify this attribute on closures and generators, so it was impossible to view results for these MIR bodies.
This PR adds a flag, `-Z dump-mir-dataflow`, which will output the dataflow results for any functions specified in `-Z dump-mir` to the output directory specified by `-Z dump-mir-dir`. This behavior is modeled on the `-Z dump-mir-graphviz` flag.
…rochenkov
Improve error messages for raw strings (rust-lang#60762)
This diff improves error messages around raw strings in a few ways:
- Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test)
- Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings
- Detect potentially intended terminators (longest sequence of "#*" is suggested)
Fixesrust-lang#60762
cc @estebank who reviewed the original (abandoned) PR for the same ticket.
r? @Centril
…ddyb
Add `can_unwind` field to `FnAbi`
This is a pure refactoring with no behavior changes.
Extracted out of rust-lang#70467
r? @eddyb
…rk-Simulacrum
Ensure LLVM is in the link path for "fulldeps" tests
This is a follow-up to rust-lang#70123, which added `llvm-config --libdir` to the
`LIBRARY_PATH` for rustc tools. We need the same for "run-make-fulldeps"
and "ui-fulldeps" tests which depend on compiler libraries, implicitly
needing to link to `-lLLVM` as well.
@Centril

Centril commented Apr 1, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Apr 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 5a0c0b3 has been approved by Centril

@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 1, 2020
@CentrilCentril added the rollup A PR which is a rollup label Apr 1, 2020
@bors

bors commented Apr 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5a0c0b3 with merge 725736274a8013fe2ae63a507455534834b4b893...

@bors

bors commented Apr 1, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors 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 Apr 1, 2020
@CentrilCentril closed this Apr 1, 2020
@Centril
Centril deleted the rollup-zmxc9ef branch April 1, 2020 12:30
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Centril@bors@rcoh@ecstatic-morse@wesleywiser@cuviper@spastorino@jonas-schievink