From f25246556cbce10bc7b50d0a9d969dd79672de1e Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 23 Sep 2023 17:44:54 -0400 Subject: [PATCH] Rename the existing StandardProperties struct to EmacsStandardProperties. --- src/compare/util.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compare/util.rs b/src/compare/util.rs index 4e8668b..d12ee6d 100644 --- a/src/compare/util.rs +++ b/src/compare/util.rs @@ -45,7 +45,7 @@ pub(crate) fn assert_bounds<'s, S: Source<'s>>( emacs: &'s Token<'s>, rust: &'s S, ) -> Result<(), Box> { - 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, #[allow(dead_code)] post_affiliated: Option, @@ -76,9 +76,9 @@ struct StandardProperties { post_blank: Option, } -fn get_standard_properties<'s>( +fn get_emacs_standard_properties<'s>( emacs: &'s Token<'s>, -) -> Result> { +) -> Result> { 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,