Lints for Rust 1.78

Signed-off-by: itowlson <[email protected]>

Author: itowlson

crates/http/src/wagi/mod.rs

@@ -184,13 +184,13 @@ fn parse_host_header_uri(
     let mut parse_host = |hdr: String| {
         let mut parts = hdr.splitn(2, ':');
         match parts.next() {
-            Some(h) if !h.is_empty() => host = h.to_owned(),
+            Some(h) if !h.is_empty() => h.clone_into(&mut host),
             _ => {}
         }
         match parts.next() {
             Some(p) if !p.is_empty() => {
                 tracing::debug!(port = p, "Overriding port");
-                port = p.to_owned()
+                p.clone_into(&mut port);
             }
             _ => {}
         }

crates/manifest/src/normalize.rs

@@ -86,7 +86,7 @@ fn normalize_trigger_ids(manifest: &mut AppManifest) {
             if let Some(ComponentSpec::Reference(component_id)) = &trigger.component {
                 let candidate_id = format!("{component_id}-{trigger_type}-trigger");
                 if !trigger_ids.contains(&candidate_id) {
-                    trigger.id = candidate_id.clone();
+                    trigger.id.clone_from(&candidate_id);
                     trigger_ids.insert(candidate_id);
                     continue;
                 }

crates/oci/src/auth.rs

@@ -60,7 +60,7 @@ impl AuthConfig {
     /// Get the registry authentication for a given registry from the default location.
     pub async fn get_auth_from_default(server: impl AsRef<str>) -> Result<RegistryAuth> {
         let auths = Self::load_default().await?;
-        let encoded = match auths.auths.get(&server.as_ref().to_string()) {
+        let encoded = match auths.auths.get(server.as_ref()) {
             Some(e) => e,
             None => bail!(format!("no credentials stored for {}", server.as_ref())),
         };

crates/trigger-http/src/handler.rs

@@ -378,7 +378,7 @@ fn set_http_origin_from_request(
                     .host_components_data()
                     .get_or_insert(outbound_http_handle);
 
-                outbound_http_data.origin = origin.clone();
+                outbound_http_data.origin.clone_from(&origin);
                 store.as_mut().data_mut().as_mut().allowed_hosts =
                     outbound_http_data.allowed_hosts.clone();
             }

crates/trigger-http/src/lib.rs

@@ -662,7 +662,10 @@ impl OutboundWasiHttpHandler for HttpRuntimeData {
                 .map(|s| s == &Scheme::HTTPS)
                 .unwrap_or_default();
             // We know that `uri` has an authority because we set it above
-            request.authority = uri.authority().unwrap().as_str().to_owned();
+            uri.authority()
+                .unwrap()
+                .as_str()
+                .clone_into(&mut request.authority);
             *request.request.uri_mut() = uri;
         }
 

crates/trigger/src/runtime_config/llm.rs

@@ -1,7 +1,4 @@
-use async_trait::async_trait;
-use spin_llm::LlmEngine;
 use spin_llm_remote_http::RemoteHttpLlmEngine;
-use spin_world::v2::llm as wasi_llm;
 use url::Url;
 
 #[derive(Default)]
@@ -26,7 +23,7 @@ pub(crate) async fn build_component(
         #[cfg(not(feature = "llm"))]
         LlmComputeOpts::Spin => {
             let _ = use_gpu;
-            spin_llm::LlmComponent::new(move || Box::new(NoopLlmEngine.clone()))
+            spin_llm::LlmComponent::new(move || Box::new(noop::NoopLlmEngine.clone()))
         }
         LlmComputeOpts::RemoteHttp(config) => {
             tracing::log::info!("Using remote compute for LLMs");
@@ -50,29 +47,36 @@ pub struct RemoteHttpComputeOpts {
     auth_token: String,
 }
 
-#[derive(Clone)]
-struct NoopLlmEngine;
+#[cfg(not(feature = "llm"))]
+mod noop {
+    use async_trait::async_trait;
+    use spin_llm::LlmEngine;
+    use spin_world::v2::llm as wasi_llm;
 
-#[async_trait]
-impl LlmEngine for NoopLlmEngine {
-    async fn infer(
-        &mut self,
-        _model: wasi_llm::InferencingModel,
-        _prompt: String,
-        _params: wasi_llm::InferencingParams,
-    ) -> Result<wasi_llm::InferencingResult, wasi_llm::Error> {
-        Err(wasi_llm::Error::RuntimeError(
-            "Local LLM operations are not supported in this version of Spin.".into(),
-        ))
-    }
+    #[derive(Clone)]
+    pub(super) struct NoopLlmEngine;
+
+    #[async_trait]
+    impl LlmEngine for NoopLlmEngine {
+        async fn infer(
+            &mut self,
+            _model: wasi_llm::InferencingModel,
+            _prompt: String,
+            _params: wasi_llm::InferencingParams,
+        ) -> Result<wasi_llm::InferencingResult, wasi_llm::Error> {
+            Err(wasi_llm::Error::RuntimeError(
+                "Local LLM operations are not supported in this version of Spin.".into(),
+            ))
+        }
 
-    async fn generate_embeddings(
-        &mut self,
-        _model: wasi_llm::EmbeddingModel,
-        _data: Vec<String>,
-    ) -> Result<wasi_llm::EmbeddingsResult, wasi_llm::Error> {
-        Err(wasi_llm::Error::RuntimeError(
-            "Local LLM operations are not supported in this version of Spin.".into(),
-        ))
+        async fn generate_embeddings(
+            &mut self,
+            _model: wasi_llm::EmbeddingModel,
+            _data: Vec<String>,
+        ) -> Result<wasi_llm::EmbeddingsResult, wasi_llm::Error> {
+            Err(wasi_llm::Error::RuntimeError(
+                "Local LLM operations are not supported in this version of Spin.".into(),
+            ))
+        }
     }
 }

tests/testcases/mod.rs

@@ -345,11 +345,11 @@ pub fn bootstrap_smoke_test(
             let mut custom_path = value.to_owned();
             if value.starts_with('.') {
                 let current_dir = env.path();
-                custom_path = current_dir
+                current_dir
                     .join(value)
                     .to_str()
                     .unwrap_or_default()
-                    .to_owned();
+                    .clone_into(&mut custom_path);
             }
             build.env(key, format!("{}:{}", custom_path, path));
         } else {