Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 13, 2019

I'm not exactly sure what happened in #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)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2019
@petrochenkov
Copy link
Contributor

Probably the third one, test build of rustc depending on rustc_interface is at least suspicious.

@Centril
Copy link
Contributor Author

Centril commented Oct 13, 2019

Yeah, I suspect so as well.

@petrochenkov
Copy link
Contributor

So we get two rustc crates - one being tested and another linked transitively through rustc_interface, them conflicting due to diagnostic items is pretty plausible.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 13, 2019
@rust-highfive

This comment has been minimized.

@Centril Centril force-pushed the refactor-bso_and_cc branch from d85e521 to 9d766ed Compare October 13, 2019 16:49
@Centril
Copy link
Contributor Author

Centril commented Oct 13, 2019

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Oct 13, 2019

📌 Commit 9d766ed has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 14, 2019
…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)
Centril added a commit to Centril/rust that referenced this pull request Oct 14, 2019
…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)
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 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 bors merged commit 9d766ed into rust-lang:master Oct 14, 2019
@Centril Centril deleted the refactor-bso_and_cc branch October 14, 2019 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants