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 when synthesizing spans falling inside unicode chars #63508

Merged
merged 3 commits into from Aug 14, 2019

Conversation

@estebank
Copy link
Contributor

commented Aug 13, 2019

Fix #61226.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 13, 2019

r? @eddyb

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

@eddyb

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb Aug 13, 2019

@pietroalbini

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

This is beta-nominated for 1.38 right?

@estebank

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

@pietroalbini correct

@ehuss

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

I'm curious, why not fix SourceMap::next_point to not create invalid spans?

@estebank

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

@ehuss That is something we should also do, but given that next_point an such are only used in best effort suggestions for malformed code, I am ok with this mild limitation in order to get rid of the ICE. Ideally this same suggestion could be accomplished without synthesizing spans and those would always be correct.

@ehuss

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

Ah, makes sense, thanks!

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

📌 Commit 84e202e has been approved by petrochenkov

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63508 - estebank:compromice, r=petrochenkov
Do not ICE when synthesizing spans falling inside unicode chars

Fix rust-lang#61226.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

☔️ The latest upstream changes (presumably #63544) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors removed the S-waiting-on-bors label Aug 14, 2019

@bors bors merged commit 84e202e into rust-lang:master Aug 14, 2019

2 of 4 checks passed

pr (Linux mingw-check)
Details
pr (Linux x86_64-gnu-llvm-6.0)
Details
pr Build #20190813.47 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.