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

Remove context from functions that no longer need it.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-18 18:28:24 -04:00
parent ba72cc1b29
commit 49d1cef7ae
3 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/parser/affiliated_keyword.rs
View File

@@ -26,7 +26,6 @@ use crate::context::Context;
use crate::context::ContextElement;
use crate::context::GlobalSettings;
use crate::context::List;
use crate::context::RefContext;
use crate::error::Res;
use crate::types::AffiliatedKeywordValue;
use crate::types::AffiliatedKeywords;
@@ -36,15 +35,14 @@ use crate::types::Keyword;
feature = "tracing",
tracing::instrument(ret, level = "debug", skip(context))
)]
pub(crate) fn affiliated_keywords<'b, 'g, 'r, 's>(
context: RefContext<'b, 'g, 'r, 's>,
pub(crate) fn affiliated_keywords<'s>(
input: OrgSource<'s>,
) -> Res<OrgSource<'s>, Vec<Keyword<'s>>> {
let mut ret = Vec::new();
let mut remaining = input;
loop {
let result = affiliated_keyword(context, remaining);
let result = affiliated_keyword(remaining);
match result {
Ok((remain, kw)) => {
remaining = remain;
@@ -68,8 +66,8 @@ where
{
let mut ret = BTreeMap::new();
for kw in input {
let translated_name = translate_name(global_settings, kw.key);
let keyword_type = identify_keyword_type(global_settings, translated_name.as_str());
let translated_name = translate_name(kw.key);
let keyword_type = identify_keyword_type(translated_name.as_str());
match keyword_type {
AffiliatedKeywordType::SingleString => {
ret.insert(
@@ -154,7 +152,7 @@ where
AffiliatedKeywords { keywords: ret }
}
fn translate_name<'g, 's>(global_settings: &'g GlobalSettings<'g, 's>, name: &'s str) -> String {
fn translate_name<'g, 's>(name: &'s str) -> String {
let name_until_optval = name
.split_once('[')
.map(|(before, _after)| before)
@@ -174,10 +172,7 @@ enum AffiliatedKeywordType {
ObjectTree,
}
fn identify_keyword_type<'g, 's>(
global_settings: &'g GlobalSettings<'g, 's>,
name: &'s str,
) -> AffiliatedKeywordType {
fn identify_keyword_type<'g, 's>(name: &'s str) -> AffiliatedKeywordType {
let is_multiple = ["CAPTION", "HEADER"]
.into_iter()
.any(|candidate| name.eq_ignore_ascii_case(candidate))