Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 14, 2019

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 23 commits October 11, 2019 08:23
Instead just use `pprust::path_to_string(..)` where needed.

This has two benefits:

a) The AST definition is now independent of printing it.
   (Therefore we get closer to extracting a data-crate.)

b) Debugging should be easier as program flow is clearer.
…=GuillaumeGomez

Add long error explanation for E0697

Part of rust-lang#61137

r? @GuillaumeGomez
syntax: consolidate function parsing in item.rs

Extracted from rust-lang#65324.

r? @estebank
Remove implicit dependencies on syntax::pprust

Part of rust-lang#65324.

The main goal here is to facilitate the eventual move of pprust out from libsyntax and because an AST definition typically should not depend on its pretty printer.

r? @estebank
…ochenkov

refactor session::config::build_session_options_and_crate_config

I'm not exactly sure what happened in rust-lang#65361 (comment) so in an effort to bisect the error I'm extracting out the first commit so it can hopefully land (I suspect the error is in the 2nd-3rd commits.)

r? @petrochenkov

(I'll r=you when the PR builder is happy)
Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering

Split out from rust-lang#65324.

r? @petrochenkov
Add some tests for fixed ICEs

Fixes rust-lang#44153 (from 1.23.0)
Fixes rust-lang#47486 (from 1.36.0)
Fixes rust-lang#48010 (from 1.38.0)
Fixes rust-lang#48027 (from nightly)
Fixes rust-lang#48638 (from nightly)
@Centril
Copy link
Contributor Author

Centril commented Oct 14, 2019

@bors r+ p=9 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 14, 2019

📌 Commit a73e073 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 Oct 14, 2019
@bors
Copy link
Collaborator

bors commented Oct 14, 2019

⌛ Testing commit a73e073 with merge dc503c6...

bors added a commit that referenced this pull request Oct 14, 2019
Rollup of 7 pull requests

Successful merges:

 - #65215 (Add long error explanation for E0697)
 - #65292 (Print lifetimes with backticks)
 - #65362 (syntax: consolidate function parsing in item.rs)
 - #65363 (Remove implicit dependencies on syntax::pprust)
 - #65379 (refactor session::config::build_session_options_and_crate_config)
 - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering)
 - #65395 (Add some tests for fixed ICEs)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Oct 14, 2019

💥 Test timed out

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 14, 2019
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2019
@Centril
Copy link
Contributor Author

Centril commented Oct 14, 2019

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2019
@bors
Copy link
Collaborator

bors commented Oct 14, 2019

⌛ Testing commit a73e073 with merge 446e5e5...

bors added a commit that referenced this pull request Oct 14, 2019
Rollup of 7 pull requests

Successful merges:

 - #65215 (Add long error explanation for E0697)
 - #65292 (Print lifetimes with backticks)
 - #65362 (syntax: consolidate function parsing in item.rs)
 - #65363 (Remove implicit dependencies on syntax::pprust)
 - #65379 (refactor session::config::build_session_options_and_crate_config)
 - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering)
 - #65395 (Add some tests for fixed ICEs)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Oct 14, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 446e5e5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 14, 2019
@bors bors merged commit a73e073 into rust-lang:master Oct 14, 2019
@Centril Centril deleted the rollup-6lzj0w5 branch October 14, 2019 14:08
@Centril Centril added the rollup A PR which is a rollup label Oct 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.

3 participants