attributed_text: switch to structured Error + ErrorKind with bo…
#458
Conversation
This file contains hidden or 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
…undary details
- Replace `ApplyAttributeError` with `Error { kind: ErrorKind, start, end, len, boundary }`
- `AttributedText::apply_attribute` now returns Result<(), Error>
- Add `Endpoint` and `BoundaryInfo` (reports offending endpoint/index and enclosing codepoint span)
- Enforce UTF-8 boundaries via `TextStorage::is_char_boundary` and surface detailed context
- Enrich `Display` to include range, len, and boundary info
- Re-export `Error`, `ErrorKind`, `BoundaryInfo`, `Endpoint` at crate root
- Update tests to assert kinds and key details in messages
waywardmonkeys
force-pushed
the
attributed_text/error-context
branch
from
49fb329 to
aeadccd
Compare
tomcur
reviewed
Nov 12, 2025
Member
tomcur
left a comment
tomcur
left a comment
There was a problem hiding this comment.
This looks good. Some nits inline, and perhaps the testing of the Display implementation in bad_range_for_apply_attribute should be snapshot-y, testing against the full output string we expect. Anyway, I've left some comments about the current asserts.
Comment on lines
+197
to
+199
| if s == 0 { | ||
| break; | ||
| } |
Member
There was a problem hiding this comment.
In principle this should be impossible, as text.is_char_boundary(0) should always be true.
Suggested change
| if s == 0 { | |
| break; | |
| } | |
| // We can never wrap around `0` here, as when `s == 0` before the decrement, | |
| // the previous call to `text.is_char_boundary` (either in this loop or above) | |
| // will have returned `true`. | |
| debug_assert!(s != 0, "`s` should never wrap around 0"). |
| assert_eq!(e.kind(), ErrorKind::InvalidRange); | ||
| let msg = format!("{}", e); | ||
| assert!(msg.contains("4..3")); | ||
| assert!(msg.contains("start > end") || msg.contains("invalid range")); |
Member
There was a problem hiding this comment.
Do we expect to always keep saying both that the range is invalid, and why it's invalid?
Suggested change
| assert!(msg.contains("start > end") || msg.contains("invalid range")); | |
| assert!(msg.contains("start > end")); | |
| assert!(msg.contains("invalid range")); |
| Err(e) => { | ||
| assert_eq!(e.kind(), ErrorKind::InvalidBounds); | ||
| let msg = format!("{}", e); | ||
| assert!(msg.contains("7..8") || msg.contains("8")); |
Member
There was a problem hiding this comment.
Similar to above, this perhaps should be &&, but at the same time, as written the second expression is implied by the first.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
…undary details
ApplyAttributeErrorwithError { kind: ErrorKind, start, end, len, boundary }AttributedText::apply_attributenow returns Result<(), Error>EndpointandBoundaryInfo(reports offending endpoint/index and enclosing codepoint span)TextStorage::is_char_boundaryand surface detailed contextDisplayto include range, len, and boundary infoError,ErrorKind,BoundaryInfo,Endpointat crate root