Fix clippy lints on current (#3332)

Author: GnomedDev

.github/workflows/lint.yml

@@ -26,9 +26,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Run clippy
-        #!! Remove `-A clippy::result_large_err` once this is on `next`. This is to
-        #!! temporarily allow Clippy CI to run on `current`
-        run: cargo clippy --workspace --tests --features full -- -A clippy::result_large_err -D warnings --cfg ignore_serenity_deprecated
+        run: cargo clippy --workspace --tests --features full -- -D warnings --cfg ignore_serenity_deprecated
 
   rustfmt:
     name: Format

examples/testing/src/main.rs

@@ -399,16 +399,18 @@ impl EventHandler for Handler {
 }
 
 #[tokio::main]
-async fn main() -> Result<(), serenity::Error> {
+async fn main() {
     if let Some(arg) = std::env::args().nth(1) {
         if arg == "--print-sizes" {
             model_type_sizes::print_ranking();
-            return Ok(());
+            return;
         }
     }
 
     env_logger::init();
     let token = std::env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
-    Client::builder(token, intents).event_handler(Handler).await?.start().await
+
+    let mut client = Client::builder(token, intents).event_handler(Handler).await.unwrap();
+    client.start().await.unwrap();
 }

src/framework/standard/args.rs

@@ -317,7 +317,7 @@ enum State {
 #[derive(Clone, Debug)]
 pub struct Args {
     message: String,
-    args: Vec<Token>,
+    tokens: Vec<Token>,
     offset: usize,
     state: State,
 }
@@ -359,7 +359,7 @@ impl Args {
             .map(Delimiter::to_str)
             .collect::<Vec<_>>();
 
-        let args = if delims.is_empty() {
+        let tokens = if delims.is_empty() {
             let msg = message.trim();
             let kind = if is_quoted(msg) { TokenKind::QuotedArgument } else { TokenKind::Argument };
 
@@ -387,7 +387,7 @@ impl Args {
         };
 
         Args {
-            args,
+            tokens,
             message: message.to_string(),
             offset: 0,
             state: State::None,
@@ -396,7 +396,7 @@ impl Args {
 
     #[inline]
     fn span(&self) -> (usize, usize) {
-        self.args[self.offset].span
+        self.tokens[self.offset].span
     }
 
     #[inline]
@@ -574,7 +574,7 @@ impl Args {
             return self;
         }
 
-        let is_quoted = self.args[self.offset].kind == TokenKind::QuotedArgument;
+        let is_quoted = self.tokens[self.offset].kind == TokenKind::QuotedArgument;
 
         if is_quoted {
             match self.state {
@@ -733,7 +733,7 @@ impl Args {
     #[must_use]
     pub fn raw(&self) -> RawArguments<'_> {
         RawArguments {
-            tokens: &self.args,
+            tokens: &self.tokens,
             msg: &self.message,
             quoted: false,
         }
@@ -802,7 +802,7 @@ impl Args {
         self.offset = pos;
         let parsed = self.single_quoted::<T>()?;
 
-        self.args.remove(pos);
+        self.tokens.remove(pos);
         self.offset = before;
         self.rewind();
 
@@ -888,7 +888,7 @@ impl Args {
     #[inline]
     #[must_use]
     pub fn len(&self) -> usize {
-        self.args.len()
+        self.tokens.len()
     }
 
     /// Assert that there are no more arguments left.