Cargo clippy updates for Rust 1.81

Signed-off-by: Kate Goldenring <[email protected]>

Author: kate-goldenring

.github/workflows/build.yml

@@ -23,7 +23,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: "1.80"
+  RUST_VERSION: "1.81"
 jobs:
   lint-rust:
     name: Lint Rust

.github/workflows/release.yml

@@ -20,7 +20,7 @@ concurrency: ${{ github.workflow }}
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: "1.80"
+  RUST_VERSION: "1.81"
 
 jobs:
   build:

Cargo.toml

@@ -8,7 +8,7 @@ edition = { workspace = true }
 version = "0.10.0"
 authors = ["Fermyon Engineering <[email protected]>"]
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.81"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/commands/deploy.rs

@@ -578,10 +578,11 @@ fn check_safe_app_name(name: &str) -> Result<()> {
 // The path consists of slash-separated components. Each component may contain lowercase letters, digits and separators.
 // A separator is defined as a period, one or two underscores, or one or more hyphens. A component may not start or end with a separator.
 fn sanitize_app_name(name: &str) -> String {
+    let trim_chars = ['.', '_', '-'];
     name.to_ascii_lowercase()
         .replace(' ', "")
-        .trim_start_matches(|c: char| c == '.' || c == '_' || c == '-')
-        .trim_end_matches(|c: char| c == '.' || c == '_' || c == '-')
+        .trim_start_matches(trim_chars)
+        .trim_end_matches(trim_chars)
         .to_string()
 }
 
@@ -590,9 +591,7 @@ fn sanitize_app_name(name: &str) -> String {
 // A tag name must be valid ASCII and may contain lowercase and uppercase letters, digits, underscores, periods and hyphens.
 // A tag name may not start with a period or a hyphen and may contain a maximum of 128 characters.
 fn sanitize_app_version(tag: &str) -> String {
-    let mut sanitized = tag
-        .trim()
-        .trim_start_matches(|c: char| c == '.' || c == '-');
+    let mut sanitized = tag.trim().trim_start_matches(['.', '-']);
 
     if sanitized.len() > 128 {
         (sanitized, _) = sanitized.split_at(128);