diff options
Diffstat (limited to 'src/wikitext.rs')
-rw-r--r-- | src/wikitext.rs | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/src/wikitext.rs b/src/wikitext.rs index 77d6b58..39fbd32 100644 --- a/src/wikitext.rs +++ b/src/wikitext.rs @@ -201,39 +201,14 @@ impl WikiLink { pub struct ParsedDirective { name: String, args: HashMap<String, String>, - unnamed_arg: Option<String>, } impl ParsedDirective { - pub fn new(name: &str, mut args: HashMap<String, String>) -> Result<Self, SiteError> { + pub fn new(name: &str, args: HashMap<String, String>) -> Result<Self, SiteError> { trace!("ParsedDirective::new: name={:?} args={:?}", name, args); - let unnamed_args: Vec<String> = args - .iter() - .filter_map(|(k, v)| { - if v.is_empty() { - Some(k.to_string()) - } else { - None - } - }) - .collect(); - trace!("ParsedDirective::new: unnamed_args={:?}", unnamed_args); - - let unnamed_arg = match unnamed_args.len() { - 0 => None, - 1 => { - let key = unnamed_args.get(0).unwrap(); - args.remove(key); - Some(key.to_string()) - } - _ => return Err(SiteError::TooManyUnnamedArgs(name.into())), - }; - trace!("ParsedDirective::new: unnamed_arg={:?}", unnamed_arg); - Ok(Self { name: name.into(), args, - unnamed_arg, }) } @@ -248,8 +223,17 @@ impl ParsedDirective { .collect() } - pub fn unnamed_arg(&self) -> Option<&str> { - self.unnamed_arg.as_deref() + pub fn unnamed_args(&self) -> Vec<&str> { + self.args + .iter() + .filter_map(|(k, v)| { + if v.is_empty() { + Some(k.as_str()) + } else { + None + } + }) + .collect() } } |