eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-07 06:17:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(command_parser): remove the Empty token, we don't need it

Browse source
This commit is contained in:
dusk 2025-01-24 04:13:06 +09:00
parent 071db3d6d6
commit 92276a720e
No known key found for this signature in database
4 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/command_parser/src/token.rs
View file

@ -6,10 +6,6 @@ use crate::parameter::{Parameter, ParameterKind, ParameterValue};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum Token {
/// Token used to represent a finished command (i.e. no more parameters required)
// todo: this is likely not the right way to represent this
Empty,
/// A bot-defined command / subcommand (usually) (eg. "member" in `pk;member MyName`)
Value {
name: SmolStr,
@ -69,8 +65,6 @@ impl Token {
None => {
// short circuit on:
return match self {
// empty token
Self::Empty => Some(Ok(None)),
// missing paramaters
Self::Parameter(param) => Some(Err(TokenMatchError::MissingParameter {
name: param.name().into(),
@ -85,7 +79,6 @@ impl Token {
// try actually matching stuff
match self {
Self::Empty => None,
Self::Value { name, aliases } => (aliases.iter().chain(std::iter::once(name)))
.any(|v| v.eq(input))
.then(|| TokenMatchValue::new_match(input))
@ -104,7 +97,6 @@ impl Token {
impl Display for Token {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::Empty => write!(f, ""),
Self::Value { name, .. } => write!(f, "{name}"),
Self::Parameter(param) => param.kind().format(f, param.name()),
}