This repository was archived by the owner on Jun 3, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
step line numbers are recorded when protocol is loaded (#65) (#121) #183
Open
soenkehahn
wants to merge
7
commits into
master
Choose a base branch
from
sh/line-numbers
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5bdc38c
step line numbers are recorded when protocol is loaded (#65) (#121)
hallettj b98bf75
move yaml-rust fork to Originate org
b69162c
remove `marker` method, use field access instead
9da9831
revert changes to expected error messages for mismatched types in YAML
5df3361
remove unnecessary trait implementations for `Marker`
f9317a0
remove `line` getter from `Marker`
cbd43af
add tests specific to line number reporting
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| use yaml_rust; | ||
|
|
||
| #[derive(Clone, Copy, Debug, Eq, PartialEq)] | ||
| pub struct Marker { | ||
| pub line: usize, | ||
| pub col: usize, | ||
| } | ||
|
|
||
| impl<'a> From<&'a yaml_rust::Marker> for Marker { | ||
| fn from(marker: &'a yaml_rust::Marker) -> Self { | ||
| Marker { | ||
| line: marker.line(), | ||
| col: marker.col(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl From<yaml_rust::Marker> for Marker { | ||
| fn from(marker: yaml_rust::Marker) -> Self { | ||
| Marker { | ||
| line: marker.line(), | ||
| col: marker.col(), | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we implementing our own
Markerand don't reuse the one fromyaml-rust?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I construct
Markervalues in some tests. The fields inyaml_rust::Markerare private, and so is the constructor.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, but shouldn't your changes to
yaml-rustmake those things public? If the first and only usage of the newyaml-rustversion needs this to be public?