ember/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: Clippy fixes

Browse source
This commit is contained in:
Ginger 2026-01-12 09:32:30 -05:00
parent 89be9d1efc
commit 3f790844f3
No known key found for this signature in database
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xtask/src/tasks/generate_docs/admin_commands.rs
View file

@ -38,26 +38,23 @@ struct Subcommand {
fn flatten_subcommands(command: &Command) -> Vec<Subcommand> {
let mut subcommands = Vec::new();
let mut name_stack = Vec::new();
fn flatten(
subcommands: &mut Vec<Subcommand>,
stack: &mut Vec<String>,
name_stack: &mut Vec<String>,
command: &Command
) {
let depth = stack.len();
stack.push(command.get_name().to_owned());
let depth = name_stack.len();
name_stack.push(command.get_name().to_owned());
// do not include the root command
if depth > 0 {
let name = stack.join(" ");
let name = name_stack.join(" ");
let description = command
.get_long_about()
.or_else(|| command.get_about())
.map(|about| about.to_string())
.unwrap_or("_(no description)_".to_owned());
.map_or_else(|| "_(no description)_".to_owned(), ToString::to_string);
subcommands.push(
Subcommand {
@ -69,12 +66,15 @@ fn flatten_subcommands(command: &Command) -> Vec<Subcommand> {
}
for command in command.get_subcommands() {
flatten(subcommands, stack, command);
flatten(subcommands, name_stack, command);
}
stack.pop();
name_stack.pop();
}
let mut subcommands = Vec::new();
let mut name_stack = Vec::new();
flatten(&mut subcommands, &mut name_stack, command);
subcommands

7
xtask/src/tasks/generate_docs/mod.rs
View file

@ -17,7 +17,7 @@ struct FileQueue {
impl FileQueue {
fn write(self, root: &Path, dry_run: bool) -> std::io::Result<()> {
for (path, contents) in self.queue.into_iter() {
for (path, contents) in self.queue {
let path = root.join(&path);
eprintln!("Writing {}", path.display());
@ -35,9 +35,7 @@ impl FileOutput for FileQueue {
assert!(path.is_relative(), "path must be relative");
assert!(path.extension().is_some(), "path must not point to a directory");
if self.queue.contains_key(&path) {
panic!("attempted to create an already created file {}", path.display());
}
assert!(!self.queue.contains_key(&path), "attempted to create an already created file {}", path.display());
self.queue.insert(path, contents);
}
@ -49,6 +47,7 @@ pub(crate) struct Args {
root: Option<PathBuf>,
}
#[expect(clippy::needless_pass_by_value)]
pub(super) fn run(common_args: crate::Args, task_args: Args) -> TaskResult<()> {
let mut queue = FileQueue::default();