talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename the existing StandardProperties struct to EmacsStandardProperties.

Browse Source
This commit is contained in:
Tom Alexander 2023-09-23 17:44:54 -04:00
parent 3fe56e9aa3
commit f25246556c
No known key found for this signature in database
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compare/util.rs
View File

@ -45,7 +45,7 @@ pub(crate) fn assert_bounds<'s, S: Source<'s>>(
emacs: &'s Token<'s>,
rust: &'s S,
) -> Result<(), Box<dyn std::error::Error>> {
let standard_properties = get_standard_properties(emacs)?;
let standard_properties = get_emacs_standard_properties(emacs)?;
let (begin, end) = (
standard_properties
.begin
@ -63,7 +63,7 @@ pub(crate) fn assert_bounds<'s, S: Source<'s>>(
Ok(())
}
struct StandardProperties {
struct EmacsStandardProperties {
begin: Option<usize>,
#[allow(dead_code)]
post_affiliated: Option<usize>,
@ -76,9 +76,9 @@ struct StandardProperties {
post_blank: Option<usize>,
}
fn get_standard_properties<'s>(
fn get_emacs_standard_properties<'s>(
emacs: &'s Token<'s>,
) -> Result<StandardProperties, Box<dyn std::error::Error>> {
) -> Result<EmacsStandardProperties, Box<dyn std::error::Error>> {
let children = emacs.as_list()?;
let attributes_child = children
.iter()
@ -97,7 +97,7 @@ fn get_standard_properties<'s>(
let contents_end = maybe_token_to_usize(std_props.next())?;
let end = maybe_token_to_usize(std_props.next())?;
let post_blank = maybe_token_to_usize(std_props.next())?;
StandardProperties {
EmacsStandardProperties {
begin,
post_affiliated,
contents_begin,
@ -116,7 +116,7 @@ fn get_standard_properties<'s>(
maybe_token_to_usize(attributes_map.get(":post-blank").map(|token| *token))?;
let post_affiliated =
maybe_token_to_usize(attributes_map.get(":post-affiliated").map(|token| *token))?;
StandardProperties {
EmacsStandardProperties {
begin,
post_affiliated,
contents_begin,