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

Make the parser TokenStream more resilient after mismatched delimiter recovery #62887

Merged
merged 3 commits into from Jul 26, 2019

Conversation

@estebank
Copy link
Contributor

commented Jul 23, 2019

Fix #62881, fix #62895.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jul 23, 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 Jul 23, 2019

@dwrensha

This comment has been minimized.

Copy link
Contributor

commented Jul 23, 2019

Note while this may fix #62881, it looks to me like it does not fix the related issue #62895.

= note: expected type `isize`
found type `()`

error: aborting due to 6 previous errors

This comment has been minimized.

Copy link
@estebank

estebank Jul 23, 2019

Author Contributor

I'm somewhat distraught that the mismatched delimiters error is not emitted in this case :-/

@Centril
Copy link
Member

left a comment

Assorted nits... :)

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved
src/test/ui/issues/issue-62881.rs Outdated Show resolved Hide resolved

@estebank estebank added the T-compiler label Jul 24, 2019

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

📌 Commit fe2b5bb has been approved by petrochenkov

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

Update from compiler-team:

Accepted for beta backport.

Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019

Rollup merge of rust-lang#62887 - estebank:issue-62881, r=petrochenkov
Make the parser TokenStream more resilient after mismatched delimiter recovery

Fix rust-lang#62881, fix rust-lang#62895.

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62990 - Centril:rollup-k9n0hvs, r=Centril
Rollup of 15 pull requests

Successful merges:

 - #60066 (Stabilize the type_name intrinsic in core::any)
 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61884 (Stablize Euclidean Modulo (feature euclidean_division))
 - #61890 (Fix some sanity checks)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62707 (Add tests for overlapping explicitly dropped locals in generators)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62822 (Improve some pointer-related documentation)
 - #62887 (Make the parser TokenStream more resilient after mismatched delimiter recovery)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62930 (Add test for #51559)
 - #62942 (Use match ergonomics in Condvar documentation)
 - #62977 (Fix inconsistent highlight blocks.)
 - #62978 (Remove `cfg(bootstrap)` code for array implementations)
 - #62981 (Add note suggesting to borrow a String argument to find)

Failed merges:

 - #62964 (clarify and unify some type test names)

r? @ghost

@bors bors merged commit fe2b5bb into rust-lang:master Jul 26, 2019

4 checks passed

pr Build #20190723.44 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details

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

Auto merge of #63262 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Cherry picked:

*  Updated RELEASES.md for 1.37.0 #63147
*  Require a value for configure --debuginfo-level #62906
*  Make the parser TokenStream more resilient after mismatched delimiter recovery #62887
*  ci: move .azure-pipelines to src/ci/azure-pipelines #63242

Rolled up:

*  [BETA] Update cargo #62911
*  [beta] Backport #61207 #63254

r? @ghost

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

Auto merge of #63262 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Cherry picked:

*  Updated RELEASES.md for 1.37.0 #63147
*  Require a value for configure --debuginfo-level #62906
*  Make the parser TokenStream more resilient after mismatched delimiter recovery #62887
*  ci: move .azure-pipelines to src/ci/azure-pipelines #63242

Rolled up:

*  [BETA] Update cargo #62911
*  [beta] Backport #61207 #63254

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.