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.

Sign up for GitHub

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

Jump to bottom

Fix issue with std.json incorrectly replacing forward slashes with a backslash #5167

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Fix issue with std.json incorrectly replacing forward slashes with a backslash #5167

merged 2 commits into from
Apr 27, 2020

Conversation

SuperAuguste
Copy link
Contributor

std.json incorrectly replaced / with a \, this pull request fixes that.

@SuperAuguste
Copy link
Contributor Author

Sorry about all of the clutter, didn't properly cherry-pick the changes.

@SuperAuguste SuperAuguste changed the title Fix JSON Bug Fix issue with std.json incorrectly replacing forward slashes with a backslash Apr 25, 2020
@daurnimator daurnimator added the standard library This issue involves writing Zig code for the standard library. label Apr 26, 2020
@daurnimator
Copy link
Contributor

Please add a test.

You should be able to git rebase your extra commits away.

@SuperAuguste
Copy link
Contributor Author

Messed this pull request up really bad, I'm gonna just make a new one at this point and properly cherrypick the changes.

@daurnimator
Copy link
Contributor

Messed this pull request up really bad, I'm gonna just make a new one at this point and properly cherrypick the changes.

please don't! just force push to your branch

@SuperAuguste SuperAuguste reopened this Apr 26, 2020
@SuperAuguste
Copy link
Contributor Author

Sorry, I'm new to this Git Pull Request stuff, so I have no idea how to fix this.

@daurnimator
Copy link
Contributor

Sorry, I'm new to this Git Pull Request stuff, so I have no idea how to fix this.

Assuming that this repository is your origin remote and SuperAuguste is your fork:

git fetch origin
git rebase origin/master
git push --force SuperAuguste

@SuperAuguste
Copy link
Contributor Author

daurnimator, you are my hero! Thank you so much for your help! :)

@daurnimator daurnimator mentioned this pull request Apr 27, 2020
Closed
@layneson layneson mentioned this pull request Apr 27, 2020
Closed
@andrewrk andrewrk merged commit 0df8288 into ziglang:master Apr 27, 2020
@andrewrk
Copy link
Member

Thank you @SuperAuguste!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
standard library This issue involves writing Zig code for the standard library.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SuperAuguste @daurnimator @andrewrk