Fixes ordered_elements implementation #225
Merged
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
zslayton
reviewed
Oct 25, 2024
Comment on lines
169
to
170
| // Need to clone the range because strangely &RangeInclusive doesn't | ||
| // implement Copy or IntoIterator. |
There was a problem hiding this comment.
Happily, this weirdness is getting addressed in edition 2024.
zslayton
approved these changes
Oct 25, 2024
ion-schema/src/violation.rs
Outdated
Comment on lines
97
to
99
| let one_indent = " "; | ||
| // TODO: Consider extracting this into a static or thread local variable. | ||
| let mut indentation = vec![one_indent.to_string()]; |
There was a problem hiding this comment.
This works, but why have a Vec of indentation Strings instead of a single String that you add spacing to as the stack gets deeper?
There was a problem hiding this comment.
Lol, it's because I've been using too much Java recently, and I forgot that strings can be mutated in Rust. I'll fix it.
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.
Issue #, if available:
Fix #56
Fix #221
Fix #105
Description of changes:
Complete rewrite of the state machine for ordered elements. This fixes all the correctness issues with
ordered_elements; now all of theion-schema-testscases forordered_elementsare enabled and passing. It also brings improved violation messaging for theordered_elementsconstraint—although not quite as nice as amazon-ion/ion-schema-kotlin#228 because the source ISL isn't available by the time we're constructing the ordered elements NFA, and I didn't want to tackle that as part of this PR since I think the violations may end up being refactored before v1.0.0 anyway.That being said, I did go and update the implementation of
DisplayforViolationbecause it was printing stuff on one line in a completely unusable way. The new implementation is a little bit more likeion-schema-kotlinin that it prints a multi-line tree of violations.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.