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

Do not ICE on multipart suggestions touching multiple files #68530

Merged
merged 1 commit into from
Jan 25, 2020

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jan 25, 2020

When encountering a multipart suggestion with spans belonging to
different contexts, skip that suggestion.

Fix #68449. Similar to #68256.

When encountering a multipart suggestion with spans belonging to
different contexts, skip that suggestion.
@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 25, 2020
@estebank
Copy link
Contributor Author

Depending on the beta cut-off, this might need backporting to beta.

@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 25, 2020
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 25, 2020

📌 Commit b626202 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 25, 2020
Do not ICE on multipart suggestions touching multiple files

When encountering a multipart suggestion with spans belonging to
different contexts, skip that suggestion.

Fix rust-lang#68449. Similar to rust-lang#68256.
@bors
Copy link
Contributor

bors commented Jan 25, 2020

⌛ Testing commit b626202 with merge 6d3f4e0...

bors added a commit that referenced this pull request Jan 25, 2020
Do not ICE on multipart suggestions touching multiple files

When encountering a multipart suggestion with spans belonging to
different contexts, skip that suggestion.

Fix #68449. Similar to #68256.
@bors
Copy link
Contributor

bors commented Jan 25, 2020

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 6d3f4e0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 25, 2020
@bors bors merged commit b626202 into rust-lang:master Jan 25, 2020
@nikomatsakis
Copy link
Contributor

Would be good to have had a test here =) Seems like a subtle bug we would want to be able to test for

@pnkfelix
Copy link
Member

pnkfelix commented Feb 6, 2020

discussed at T-compiler triage meeting. approved for beta backport.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 6, 2020
@Mark-Simulacrum
Copy link
Member

This appears to already be in beta? At least cherry-picking the commit here gives me an empty commit. Denominating.

@Mark-Simulacrum Mark-Simulacrum removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Feb 6, 2020
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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE when using a reference incorrectly in quick_error
7 participants