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

refactor(commands): also use smolstr for commands themselves

Browse source
This commit is contained in:
dusk 2025-01-04 07:43:55 +09:00
parent af523a4c23
commit b9867e7ea3
No known key found for this signature in database
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/commands/src/commands.rs
View file

@ -18,26 +18,28 @@ pub mod server_config;
pub mod switch; pub mod switch;
pub mod system; pub mod system;
use smol_str::SmolStr;
use crate::{command, token::Token}; use crate::{command, token::Token};
#[derive(Clone)] #[derive(Clone)]
pub struct Command { pub struct Command {
// TODO: fix hygiene // TODO: fix hygiene
pub tokens: Vec<Token>, pub tokens: Vec<Token>,
pub help: String, pub help: SmolStr,
pub cb: String, pub cb: SmolStr,
} }
impl Command { impl Command {
pub fn new( pub fn new(
tokens: impl IntoIterator<Item = Token>, tokens: impl IntoIterator<Item = Token>,
help: impl ToString, help: impl Into<SmolStr>,
cb: impl ToString, cb: impl Into<SmolStr>,
) -> Self { ) -> Self {
Self { Self {
tokens: tokens.into_iter().collect(), tokens: tokens.into_iter().collect(),
help: help.to_string(), help: help.into(),
cb: cb.to_string(), cb: cb.into(),
} }
} }
} }

2
crates/commands/src/lib.rs
View file

@ -84,7 +84,7 @@ fn parse_command(input: String) -> CommandResult {
if let Some(command_ref) = local_tree.current_command_key { if let Some(command_ref) = local_tree.current_command_key {
return CommandResult::Ok { return CommandResult::Ok {
command: ParsedCommand { command: ParsedCommand {
command_ref: command_ref.to_owned(), command_ref: command_ref.into(),
args, args,
flags, flags,
}, },

4
crates/commands/src/tree.rs
View file

@ -1,9 +1,11 @@
use smol_str::SmolStr;
use crate::{commands::Command, Token}; use crate::{commands::Command, Token};
use std::{cmp::Ordering, collections::HashMap}; use std::{cmp::Ordering, collections::HashMap};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct TreeBranch { pub struct TreeBranch {
pub current_command_key: Option<String>, pub current_command_key: Option<SmolStr>,
/// branches.keys(), but sorted by specificity /// branches.keys(), but sorted by specificity
pub possible_tokens: Vec<Token>, pub possible_tokens: Vec<Token>,
pub branches: HashMap<Token, TreeBranch>, pub branches: HashMap<Token, TreeBranch>,