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

Fix json parser close tracking #6865

Merged
merged 2 commits into from Nov 9, 2020
Merged

Conversation

daurnimator
Copy link
Collaborator

Some fixes cherry picked out of #5852 that I'd like to get merged before 0.7.0.

@daurnimator daurnimator added the standard library This issue involves writing Zig code for the standard library. label Oct 29, 2020
@andrewrk
Copy link
Member

The failures look legit

@daurnimator
Copy link
Collaborator Author

daurnimator commented Nov 3, 2020

The failures look legit

Ah sorry; when cleaning up the old PR I removed a significant white-space; should pass now.

Current CI failure is in unrelated mips gimli code

@andrewrk andrewrk merged commit 73f3f01 into ziglang:master Nov 9, 2020
andrewrk pushed a commit that referenced this pull request Nov 9, 2020
* std: fix json parsing with unmatched closing tokens

* std: fix swapped json parsing errors
@andrewrk
Copy link
Member

andrewrk commented Nov 9, 2020

cherry-picked into 0.7.x => 904c513

@daurnimator daurnimator deleted the json-errors branch January 31, 2021 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
standard library This issue involves writing Zig code for the standard library.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants