Merge pull request #2680 from fermyon/rust-1-80-changes

Changes need to make Rust and Clippy happy on Rust 1.80

crates/componentize/src/abi_conformance/mod.rs

@@ -12,12 +12,12 @@
 //! (i.e. inbound requests) or by the host (i.e. outbound requests).
 //!
 //! - For a guest-implemented function, the host will call the function and assert the result matches what is
-//! expected (see [`Report::inbound_http`] for an example).
+//!   expected (see [`Report::inbound_http`] for an example).
 //!
 //! - For a host-implemented function, the host will call a guest-implemented function according to the specified
-//! [`InvocationStyle`] with a set of arguments indicating which host function to call and with what arguments.
-//! The host then asserts that host function was indeed called with the expected arguments (see
-//! [`Report::http`] for an example).
+//!   [`InvocationStyle`] with a set of arguments indicating which host function to call and with what arguments.
+//!   The host then asserts that host function was indeed called with the expected arguments (see
+//!   [`Report::http`] for an example).
 
 #![deny(warnings)]
 
@@ -88,7 +88,7 @@ pub struct TestConfig {
 /// - Guest-implemented exports which behave as prescribed by the test (e.g. `inbound_http` and `inbound_redis`)
 ///
 /// - Host-implemented imports which are called by the guest with the arguments specified by the host
-/// (e.g. `http`)
+///   (e.g. `http`)
 #[derive(Serialize, PartialEq, Eq, Debug)]
 pub struct Report {
     /// Result of the Spin inbound HTTP test

crates/core/tests/integration_test.rs

@@ -160,7 +160,6 @@ async fn test_host_component_data_update() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[cfg(not(tarpaulin))]
 async fn test_panic() {
     let err = run_core_wasi_test(["panic"], |_| {}).await.unwrap_err();
     let trap = err.downcast::<Trap>().expect("trap");

crates/key-value-azure/src/lib.rs

@@ -61,7 +61,7 @@ pub enum KeyValueAzureCosmosAuthOptions {
     ///
     /// Common across each:
     /// - `AZURE_AUTHORITY_HOST`: (optional) the host for the identity provider. For example, for Azure public cloud the host defaults to "https://login.microsoftonline.com".
-    /// See also: https://github.com/Azure/azure-sdk-for-rust/blob/main/sdk/identity/README.md
+    ///   See also: https://github.com/Azure/azure-sdk-for-rust/blob/main/sdk/identity/README.md
     Environmental,
 }
 

crates/trigger/src/runtime_config.rs

@@ -346,7 +346,7 @@ impl TriggerHooks for SummariseRuntimeConfigHook {
                 for (id, opt) in &opt.sqlite_databases {
                     opts.push(Self::summarise_sqlite(id, opt));
                 }
-                for opt in &opt.llm_compute {
+                if let Some(opt) = &opt.llm_compute {
                     opts.push(Self::summarise_llm(opt));
                 }
             }

tests/integration.rs

@@ -1038,7 +1038,6 @@ route = "/..."
 
     /// Build an app whose component `workdir` is a subdirectory.
     #[test]
-    #[cfg(not(tarpaulin))]
     fn test_build_command_nested_workdir() -> anyhow::Result<()> {
         do_test_build_command("tests/testcases/nested-build")
     }