Merge pull request #3001 from itowlson/lints-and-fmts-and-analyses-1.84

New clippies and rust-analyzer chores for Rust 1.84

Author: itowlson

crates/compose/src/lib.rs

@@ -26,8 +26,8 @@ use wac_graph::{CompositionGraph, NodeId};
 /// dependent component. Finally, the composer will export all exports from the
 /// dependent component to its dependents. The composer will then encode the
 /// composition graph into a byte array and return it.
-pub async fn compose<'a, L: ComponentSourceLoader>(
-    loader: &'a L,
+pub async fn compose<L: ComponentSourceLoader>(
+    loader: &L,
     component: &LockedComponent,
 ) -> Result<Vec<u8>, ComposeError> {
     Composer::new(loader).compose(component).await

crates/doctor/src/lib.rs

@@ -13,7 +13,7 @@ pub mod manifest;
 /// Diagnose for Rust-specific problems.
 pub mod rustlang;
 /// Test helpers.
-pub mod test;
+pub(crate) mod test;
 /// Diagnoses for Wasm source problems.
 pub mod wasm;
 

crates/expressions/src/lib.rs

@@ -277,7 +277,7 @@ impl<'a> TryFrom<&'a str> for Key<'a> {
     }
 }
 
-impl<'a> AsRef<str> for Key<'a> {
+impl AsRef<str> for Key<'_> {
     fn as_ref(&self) -> &str {
         self.0
     }

crates/factor-outbound-http/src/wasi.rs

@@ -60,7 +60,7 @@ pub(crate) struct WasiHttpImplInner<'a> {
     table: &'a mut ResourceTable,
 }
 
-impl<'a> WasiHttpView for WasiHttpImplInner<'a> {
+impl WasiHttpView for WasiHttpImplInner<'_> {
     fn ctx(&mut self) -> &mut WasiHttpCtx {
         &mut self.state.wasi_http_ctx
     }

crates/factor-wasi/src/lib.rs

@@ -155,7 +155,7 @@ pub struct MountFilesContext<'a> {
     ctx: &'a mut WasiCtxBuilder,
 }
 
-impl<'a> MountFilesContext<'a> {
+impl MountFilesContext<'_> {
     pub fn preopened_dir(
         &mut self,
         host_path: impl AsRef<Path>,
@@ -284,7 +284,7 @@ struct WasiImplInner<'a> {
     table: &'a mut ResourceTable,
 }
 
-impl<'a> WasiView for WasiImplInner<'a> {
+impl WasiView for WasiImplInner<'_> {
     fn ctx(&mut self) -> &mut WasiCtx {
         self.ctx
     }

crates/factors-executor/src/lib.rs

@@ -191,7 +191,7 @@ pub struct FactorsInstanceBuilder<'a, F: RuntimeFactors, U> {
     factors: &'a F,
 }
 
-impl<'a, T: RuntimeFactors, U> FactorsInstanceBuilder<'a, T, U> {
+impl<T: RuntimeFactors, U> FactorsInstanceBuilder<'_, T, U> {
     /// Returns the app component for the instance.
     pub fn app_component(&self) -> &AppComponent {
         &self.app_component
@@ -223,7 +223,7 @@ impl<'a, T: RuntimeFactors, U> FactorsInstanceBuilder<'a, T, U> {
     }
 }
 
-impl<'a, T: RuntimeFactors, U: Send> FactorsInstanceBuilder<'a, T, U> {
+impl<T: RuntimeFactors, U: Send> FactorsInstanceBuilder<'_, T, U> {
     /// Instantiates the instance with the given executor instance state
     pub async fn instantiate(
         self,

crates/oci/src/client.rs

@@ -884,6 +884,7 @@ mod test {
 
     // Convenience wrapper for deserializing from literal JSON
     #[macro_export]
+    #[allow(missing_docs)] // it's test-only, but rust-analyzer gets mad
     macro_rules! from_json {
         ($($json:tt)+) => {
             serde_json::from_value(serde_json::json!($($json)+)).expect("valid json")

crates/plugins/src/manager.rs

@@ -326,7 +326,7 @@ pub enum PluginManagerUpdateGuard<'lock> {
     Failed, // See comment on PluginManagerUpdateLock
 }
 
-impl<'lock> PluginManagerUpdateGuard<'lock> {
+impl PluginManagerUpdateGuard<'_> {
     pub fn denied(&self) -> bool {
         matches!(self, Self::Denied)
     }

crates/telemetry/src/propagation.rs

@@ -27,7 +27,7 @@ pub enum HeaderInjector<'a> {
     Http1(&'a mut http1::HeaderMap),
 }
 
-impl<'a> Injector for HeaderInjector<'a> {
+impl Injector for HeaderInjector<'_> {
     fn set(&mut self, key: &str, value: String) {
         match self {
             HeaderInjector::Http0(headers) => {
@@ -77,7 +77,7 @@ pub enum HeaderExtractor<'a> {
     Http1(&'a http1::HeaderMap),
 }
 
-impl<'a> Extractor for HeaderExtractor<'a> {
+impl Extractor for HeaderExtractor<'_> {
     fn get(&self, key: &str) -> Option<&str> {
         match self {
             HeaderExtractor::Http0(headers) => {

src/commands/up/app_source.rs

@@ -84,6 +84,7 @@ impl std::fmt::Display for AppSource {
 /// This represents a "partially loaded" source which has enough information to
 /// dispatch to the correct trigger executor but hasn't (necessarily) gone
 /// through full validation / loading yet.
+#[allow(clippy::large_enum_variant)] // allow because the large variant is the common one
 pub enum ResolvedAppSource {
     File {
         manifest_path: PathBuf,