From 9aafcb1895187c166a33ecbb9abc9cd0058ab083 Mon Sep 17 00:00:00 2001 From: Spencer Ferris <3319370+spencewenski@users.noreply.github.com> Date: Thu, 20 Jun 2024 16:44:19 -0700 Subject: [PATCH 1/2] style: Remove non-inclusive language --- README.md | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e11e1d02..b082cb1e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ and [Poem](https://github.com/poem-web/poem). boilerplate. Simply provide a [FunctionService](https://docs.rs/roadster/latest/roadster/service/function/service/struct.FunctionService.html) with your async function and register it in the `App#services` method. -- Provides sane defaults so you can focus on building your app, but most (all?) of the built-in behavior can be +- Provides sensible defaults so you can focus on building your app, but most (all?) of the built-in behavior can be customized or disabled via per-environment configuration files. - Uses `#![forbid(unsafe_code)]` to ensure all code in Roadster is 100% safe rust. - Provides a CLI for common commands, and allows consumers to provide their own CLI commands diff --git a/src/lib.rs b/src/lib.rs index 79282dad..43d90a9c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,7 @@ //! //! - Built on Tokio's web stack (axum, tower, hyper, tracing). App behavior can be easily extended by taking advantage of //! all the resources in the tokio ecosystem. -//! - Provides sane defaults so you can focus on building your app. +//! - Provides sensible defaults so you can focus on building your app. //! - Most of the built-in behavior can be customized or even disabled via per-environment configuration files. //! - Uses `#![forbid(unsafe_code)]` to ensure all code in Roadster is 100% safe rust. From 1716448296d39cb779d454858f1470a8b9d90ccb Mon Sep 17 00:00:00 2001 From: Spencer Ferris <3319370+spencewenski@users.noreply.github.com> Date: Thu, 20 Jun 2024 16:51:22 -0700 Subject: [PATCH 2/2] style: Fix clippy error --- src/api/cli/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/api/cli/mod.rs b/src/api/cli/mod.rs index b27ee913..fe8f2db1 100644 --- a/src/api/cli/mod.rs +++ b/src/api/cli/mod.rs @@ -159,10 +159,8 @@ mod tests { let args = if let Some(args) = args { args.split(' ').collect_vec() - } else if let Some(args) = arg_list { - args } else { - Default::default() + arg_list.unwrap_or_default() }; // The first word is interpreted as the binary name let args = vec!["binary_name"]