Make the parser TokenStream more resilient after mismatched delimiter recovery #62887
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
estebank
added
the
beta-nominated
estebank
commented
Jul 23, 2019
| = note: expected type `isize` | ||
| found type `()` | ||
|
|
||
| error: aborting due to 6 previous errors |
There was a problem hiding this comment.
I'm somewhat distraught that the mismatched delimiters error is not emitted in this case :-/
estebank
added
the
T-compiler
|
@bors r+ rollup |
|
📌 Commit fe2b5bb has been approved by |
bors
added
S-waiting-on-bors
nikomatsakis
added
the
beta-accepted
|
Update from compiler-team: Accepted for beta backport. |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 25, 2019
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
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
pietroalbini
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Aug 5, 2019
[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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #62881, fix #62895.